repo-file: s/content_checksum/contents_checksum/

This is what we call it everywhere else, so just be consistent.
It also lines up with metadata_checksum better.

https://bugzilla.gnome.org/show_bug.cgi?id=707727

diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index fd1ad21dafeb76d7fd1a1049a38ce02697e3fa59..3250fe297ca9ca674dd12c008dcbe40fa51925a8 100644 (file)
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -231,8 +231,8 @@ ostree_diff_dirs (GFile          *a,
       OstreeRepoFile *a_repof = (OstreeRepoFile*) a;
       OstreeRepoFile *b_repof = (OstreeRepoFile*) b;
       
-      if (strcmp (ostree_repo_file_tree_get_content_checksum (a_repof),
-                  ostree_repo_file_tree_get_content_checksum (b_repof)) == 0)
+      if (strcmp (ostree_repo_file_tree_get_contents_checksum (a_repof),
+                  ostree_repo_file_tree_get_contents_checksum (b_repof)) == 0)
         {
           ret = TRUE;
           goto out;

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index ce2c62b34cb2252d541df897dd425ed28be544ab..ca3a2dfc690729c448749b4637c3a03200f65150 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1551,7 +1551,7 @@ write_directory_to_mtree_internal (OstreeRepo                  *self,
     }
 
   if (repo_dir && repo_dir_was_empty)
-    ostree_mutable_tree_set_contents_checksum (mtree, ostree_repo_file_tree_get_content_checksum (repo_dir));
+    ostree_mutable_tree_set_contents_checksum (mtree, ostree_repo_file_tree_get_contents_checksum (repo_dir));
 
   ret = TRUE;
  out:

diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index 6ff7b1235ae4f36216d29ca8f8e1b3d0f592ce75..aff6037145c0bfb6eee6b88b0412a5cf02bc87f2 100644 (file)
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -357,7 +357,7 @@ ostree_repo_file_tree_set_metadata (OstreeRepoFile *self,
 }
 
 const char *
-ostree_repo_file_tree_get_content_checksum (OstreeRepoFile  *self)
+ostree_repo_file_tree_get_contents_checksum (OstreeRepoFile  *self)
 {
   return self->tree_contents_checksum;
 }

diff --git a/src/libostree/ostree-repo-file.h b/src/libostree/ostree-repo-file.h
index 8541641f3c8f0d50d008d7e2a49bb660be1be992..4243b80b863733d9d4406ed61cb433936593bd4c 100644 (file)
--- a/src/libostree/ostree-repo-file.h
+++ b/src/libostree/ostree-repo-file.h
@@ -65,9 +65,7 @@ void ostree_repo_file_tree_set_metadata (OstreeRepoFile *self,
                                           const char     *checksum,
                                           GVariant       *metadata);
 
-void ostree_repo_file_tree_set_content_checksum (OstreeRepoFile  *self,
-                                                  const char      *checksum);
-const char *ostree_repo_file_tree_get_content_checksum (OstreeRepoFile  *self);
+const char *ostree_repo_file_tree_get_contents_checksum (OstreeRepoFile  *self);
 
 gboolean ostree_repo_file_is_tree (OstreeRepoFile  *self);
 

diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index 79a733367436d65f5be574fc383d97645eb4f25a..c7f180f808a71ab314356af109cf5ce9a1ec817e 100644 (file)
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -92,7 +92,7 @@ print_one_file_text (GFile     *f,
   if (opt_checksum)
     {
       if (type == G_FILE_TYPE_DIRECTORY)
-        g_string_append_printf (buf, "%s ", ostree_repo_file_tree_get_content_checksum ((OstreeRepoFile*)f));
+        g_string_append_printf (buf, "%s ", ostree_repo_file_tree_get_contents_checksum ((OstreeRepoFile*)f));
       g_string_append_printf (buf, "%s ", ostree_repo_file_get_checksum ((OstreeRepoFile*)f));
     }